Make ::can_panic() return true on x86_64-pc-windows-msvc

diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index 7d395650f5dafb2d2c705bf682e4151598b9de34..ab29bcc47e51c4a25df827e4a0300a7df001f359 100644 (file)
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -1857,6 +1857,7 @@ test!(dev_dep_with_build_script {
 });
 
 test!(no_fail_fast {
+    if !::can_panic() { return }
     let p = project("foo")
         .file("Cargo.toml", r#"
             [package]

diff --git a/tests/tests.rs b/tests/tests.rs
index 570267a33d39fe49ce42111cd52c7e945320a318..15f9cde7cba275c2361629a3ede1815f8958a9bb 100644 (file)
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -74,5 +74,5 @@ fn is_nightly() -> bool {
 }
 
 fn can_panic() -> bool {
-    RUSTC.with(|r| !r.host.contains("msvc"))
+    RUSTC.with(|r| !(r.host.contains("msvc") && !r.host.contains("x86_64")))
 }